From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 22 May 2011 21:16:24 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1521
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3f7390b223e8f55faab66259515eed073ebf0f9b;p=emacs.git

Merge from mainline.
---

3f7390b223e8f55faab66259515eed073ebf0f9b